fix name conflict